ext/standard/tests: 32bit wordwrap tests aren't just for Windows #14814
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The test in strings/wordwrap_memory_limit.phpt has a counterpart in strings/wordwrap_memory_limit_win32.phpt. The two are conditional on both the OS name and the size of an int (32- versus 64-bits). A Gentoo Linux user has however reported that the 64-bit test fails on a 32-bit system, with precisely the error message that the "win32" test is expecting. I don't have any 32-bit hardware to test myself, but I think it's reasonable to conclude that the OS name is not an essential part of the test: it's simply 32- versus 64-bit. This commit drops the conditionals for the OS name. Now one test will be run on 32-bit systems, and the other on 64-bit systems, regardless of the OS name. Bug: https://bugs.gentoo.org/935382
|
I suppose the only risk here is that there are still 32-bit linux systems that raise the first kind of error (and not the "win32" error). If that turns out to be the case we could combine the two like in #14788 so that either error message will |
Looks to be the case on debug/zts builds. I'll combine the two. |
…outputs It turns out that on a 32-bit system, this test can produce either the "usual" expected output from the 64-bit test, OR the 32-bit-only integer overflow message. We copy the dual expected outputs from chunk_split_variation1_32bit.phpt to handle both cases. This fixes an earlier commit that split the two tests based only on the size of an int (32-bit versus 64-bit). The CI reveals that, at least on a debug/zts build, the "64-bit" memory limit error (and not the integer overflow error) is still produced.
nielsdos
approved these changes
Jul 4, 2024
nielsdos
added a commit
that referenced
this pull request
Jul 4, 2024
* PHP-8.2: NEWS for GH-14814 ext/standard/tests: strings/wordwrap_memory_limit_32bit.phpt has two outputs ext/standard/tests: 32bit wordwrap tests aren't just for Windows
nielsdos
added a commit
that referenced
this pull request
Jul 4, 2024
* PHP-8.3: NEWS for GH-14814 ext/standard/tests: strings/wordwrap_memory_limit_32bit.phpt has two outputs ext/standard/tests: 32bit wordwrap tests aren't just for Windows
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The test in
strings/wordwrap_memory_limit.phpthas a counterpart instrings/wordwrap_memory_limit_win32.phpt. The two are conditional on both the OS name and the size of an int (32- versus 64-bits).A Gentoo Linux user has however reported that the 64-bit test fails on a 32-bit system, with precisely the error message that the "win32" test is expecting. I don't have any 32-bit hardware to test myself, but I think it's reasonable to conclude that the OS name is not an essential part of the test: it's simply 32- versus 64-bit.
This commit drops the conditionals for the OS name. Now one test will be run on 32-bit systems, and the other on 64-bit systems, regardless of the OS name.
Bug: https://bugs.gentoo.org/935382